Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

avoid modifying a placeholder (virtual files) when not needed #6212

Merged
merged 3 commits into from
Dec 6, 2023
Merged

avoid modifying a placeholder (virtual files) when not needed #6212

merged 3 commits into from
Dec 6, 2023

Conversation

mgallien
Copy link
Collaborator

@mgallien mgallien commented Nov 9, 2023 •
edited
Loading

Close #6190
Close #3456

@mgallien mgallien force-pushed the bugfix/doNotModifyUploadedVirtualFiles branch from 78efb88 to b1b600d Compare November 9, 2023 22:00
@codecov Codecov
Copy link

codecov bot commented Nov 9, 2023 •
edited
Loading

Codecov Report

Merging #6212 (3dc583c) into master (e30decc) will increase coverage by 0.04%.
Report is 40 commits behind head on master.
The diff coverage is 100.00%.

❗ Current head 3dc583c differs from pull request most recent head bf78f00. Consider uploading reports for the commit bf78f00 to get more accurate results

Additional details and impacted files 
@@            Coverage Diff             @@
##           master    #6212      +/-   ##
==========================================
+ Coverage   60.74%   60.79%   +0.04%     
==========================================
  Files         145      145              
  Lines       18841    18836       -5     
==========================================
+ Hits        11445    11451       +6     
+ Misses       7396     7385      -11
Files Coverage Δ
src/common/vfs.h 52.38% <100.00%> (ø)
src/libsync/owncloudpropagator.cpp 84.52% <100.00%> (ø)
src/libsync/owncloudpropagator.h 65.35% <ø> (ø)
src/libsync/propagateupload.cpp 75.54% <100.00%> (ø)
src/libsync/vfs/cfapi/vfs_cfapi.cpp 82.96% <100.00%> (ø)
src/libsync/vfs/suffix/vfs_suffix.cpp 84.44% <ø> (ø)
src/libsync/vfs/suffix/vfs_suffix.h 40.00% <ø> (ø)

... and 3 files with indirect coverage changes

@mgallien mgallien enabled auto-merge November 9, 2023 22:32
@mgallien
Copy link
Collaborator Author

mgallien commented Nov 9, 2023

/backport to stable-3.10

@mgallien mgallien force-pushed the bugfix/doNotModifyUploadedVirtualFiles branch from b1b600d to 3dc583c Compare November 10, 2023 08:35
@allexzander allexzander force-pushed the bugfix/doNotModifyUploadedVirtualFiles branch from 3dc583c to 0e6bced Compare November 13, 2023 13:19
@mgallien mgallien force-pushed the bugfix/doNotModifyUploadedVirtualFiles branch from 0e6bced to 06b6a4f Compare November 13, 2023 16:37
@mgallien
Copy link
Collaborator Author

test windows build
https://cloud.nextcloud.com/s/zgYcCcpCaBwgn7q
done from the stable branch with this PR applied on top of it

@mgallien mgallien force-pushed the bugfix/doNotModifyUploadedVirtualFiles branch 2 times, most recently from 8a41d5a to 7138292 Compare November 20, 2023 12:46
allexzander
allexzander reviewed Nov 28, 2023
View reviewed changes
src/common/vfs.h Outdated Show resolved Hide resolved
src/libsync/vfs/cfapi/cfapiwrapper.cpp Show resolved Hide resolved
allexzander
allexzander reviewed Nov 28, 2023
View reviewed changes
src/common/vfs.h Outdated Show resolved Hide resolved
allexzander
allexzander suggested changes Nov 28, 2023
View reviewed changes
Copy link
Contributor

@allexzander allexzander left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks nice, but see my comment for the enum, also, kindly check why the test is failing

src/libsync/vfs/cfapi/vfs_cfapi.cpp Show resolved Hide resolved
@mgallien mgallien force-pushed the bugfix/doNotModifyUploadedVirtualFiles branch 2 times, most recently from 33b24c2 to d648eda Compare December 4, 2023 22:21
@mgallien mgallien requested a review from allexzander December 4, 2023 22:22
@mgallien mgallien force-pushed the bugfix/doNotModifyUploadedVirtualFiles branch from d648eda to 2f31231 Compare December 5, 2023 07:58
@mgallien mgallien disabled auto-merge December 6, 2023 09:02
@mgallien mgallien force-pushed the bugfix/doNotModifyUploadedVirtualFiles branch from 04ce773 to a28b949 Compare December 6, 2023 09:04
@mgallien
fix include order from most specific to less specific
369296d 
shoudl ensure that included headers are self sufficient

Signed-off-by: Matthieu Gallien <[email protected]>
@mgallien
avoid modifying a placeholder (virtual files) when not needed
b77fc9d 
acoid modifying some metadata of the placeholder when this placeholder
has just been uploaded to the server (will avoid truncating the
timestamps)

Close #6190

Signed-off-by: Matthieu Gallien <[email protected]>
@mgallien
extend log to get information about mtime modifications by the client
bf78f00 
Signed-off-by: Matthieu Gallien <[email protected]>
@mgallien mgallien force-pushed the bugfix/doNotModifyUploadedVirtualFiles branch from a28b949 to bf78f00 Compare December 6, 2023 09:42
@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-6212-bf78f008bddc034f66ab5cfac98dae6c24ac9aae-x86_64.AppImage

To test this change/fix you can simply download above AppImage file and test it.

Please make sure to quit your existing Nextcloud app and backup your data.

@mgallien mgallien merged commit 2c5281c into master Dec 6, 2023
8 of 10 checks passed
@mgallien mgallien deleted the bugfix/doNotModifyUploadedVirtualFiles branch December 6, 2023 09:53
@backportbot-nextcloud backportbot-nextcloud bot mentioned this pull request Dec 6, 2023
Merged
@mgallien
Copy link
Collaborator Author

mgallien commented Dec 6, 2023

/backport to stable-3.11

@backportbot-nextcloud backportbot-nextcloud bot mentioned this pull request Dec 6, 2023
Merged
@sonarqubecloud SonarQubeCloud
Copy link

sonarqubecloud bot commented Dec 6, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

@munrobasher
Copy link

I see that 3.10.2 has just been released. Do I assume that 3.11 is mentioned above that this fix isn't in the 3.10.2 release? Don't quite understand the version process vs Git.

@mgallien mgallien added this to the 3.12.0 milestone Dec 12, 2023
@Mika-6-9 Mika-6-9 mentioned this pull request Dec 12, 2023
Closed
@munrobasher munrobasher mentioned this pull request Feb 14, 2024
Closed
8 tasks
@Mika-6-9 Mika-6-9 mentioned this pull request Jul 19, 2024
Closed
8 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@allexzander allexzander allexzander approved these changes

@camilasan camilasan Awaiting requested review from camilasan

@claucambra claucambra Awaiting requested review from claucambra

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
3.12.0
4 participants
@mgallien @nextcloud-desktop-bot @munrobasher @allexzander